Unified the layout of devise forms

Dominik Sander 10 years ago
parent
commit
b566f5a9e6
2 changed files with 41 additions and 26 deletions
  1. 17 16
      app/views/devise/passwords/new.html.erb
  2. 24 10
      app/views/devise/unlocks/new.html.erb

+ 17 - 16
app/views/devise/passwords/new.html.erb

@@ -1,27 +1,28 @@
1
-<div class='container'>
2
-  <div class='row'>
3
-    <div class='span8 offset2'>
4
-      <div class='well'>
5
-        <h2>Forgot your password?</h2>
1
+<div class='row'>
2
+  <div class='col-md-6 col-md-offset-3'>
3
+    <div class='well'>
4
+      <h2>Forgot your password?</h2>
6 5
 
7
-        <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post, :class => 'form-horizontal' }) do |f| %>
8
-          <%= devise_error_messages! %>
6
+      <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post, :class => 'form-horizontal' }) do |f| %>
7
+        <%= devise_error_messages! %>
9 8
 
10
-          <div class="control-group">
11
-            <%= f.label :login, :class => 'control-label' %>
12
-            <div class="controls">
13
-              <%= f.text_field :login, :class => 'span4' %>
14
-            </div>
9
+        <div class="form-group">
10
+          <%= f.label :login, :class => 'col-md-2 col-md-offset-2 control-label' %>
11
+          <div class="col-md-6">
12
+            <%= f.text_field :login, :class => 'form-control' %>
15 13
           </div>
14
+        </div>
16 15
 
17
-          <div class='form-actions'>
16
+        <div class="form-group">
17
+          <div class="col-md-offset-4 col-md-10">
18 18
             <%= f.submit "Send me reset password instructions", :class => "btn btn-primary" %>
19 19
           </div>
20
-        <% end %>
20
+        </div>
21
+      <% end %>
21 22
 
22
-        <%= render "devise/shared/links" %>
23
+      <hr>
23 24
 
24
-      </div>
25
+      <%= render "devise/shared/links" %>
25 26
     </div>
26 27
   </div>
27 28
 </div>

+ 24 - 10
app/views/devise/unlocks/new.html.erb

@@ -1,14 +1,28 @@
1
-<h2>Resend unlock instructions</h2>
1
+<div class='row'>
2
+  <div class='col-md-6 col-md-offset-3'>
3
+    <div class='well'>
4
+      <h2>Resend unlock instructions</h2>
2 5
 
3
-<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
4
-  <%= devise_error_messages! %>
6
+      <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post, :class => 'form-horizontal' }) do |f| %>
7
+        <%= devise_error_messages! %>
5 8
 
6
-  <div>
7
-    <%= f.label :email %>
8
-    <%= f.email_field :email %>
9
-  </div>
9
+        <div class="form-group">
10
+          <%= f.label :email, :class => 'col-md-2 col-md-offset-2 control-label' %>
11
+          <div class="col-md-6">
12
+            <%= f.text_field :email, :class => 'form-control' %>
13
+          </div>
14
+        </div>
15
+
16
+        <div class="form-group">
17
+          <div class="col-md-offset-4 col-md-10">
18
+            <%= f.submit "Resend unlock instructions", :class => "btn btn-primary" %>
19
+          </div>
20
+        </div>
21
+      <% end %>
10 22
 
11
-  <div><%= f.submit "Resend unlock instructions" %></div>
12
-<% end %>
23
+      <hr>
13 24
 
14
-<%= render "devise/shared/links" %>
25
+      <%= render "devise/shared/links" %>
26
+    </div>
27
+  </div>
28
+</div>